clueanup

You need to push it in a different PR anyway.