Clean up some parts of nrelease