Fix bug regarding the number of water molecules removed with sphere. Add a check for water_atom.