cleanup for non hydro problems