replacing more functionality with generic saltwater stuff
cleanup