after fix water bug, remove all unused code and resources