Water Remove Logic

Added logic to remove all water entries associated with the last
submission (if water was the last submission made), otherwise the
single last entry made is removed.