Revert 0e61e8e..8943076

This rolls back to commit 0e61e8e653cd5bf5660e18657eee505db2bcf0e1.
clean up the 2nd water dungeon