Clean up code for water damage