Clean up some nuncruft