clueanup

My tip is to revert these changes, and focus purely on your other changes. Otherwise this PR is not going to be merged anytime soon.