Cleaning up final classes
TidalWater coming up!