Cleanup!

:octocat: :palm_tree: