Yeah, we need better clean up tools