Clean up code not for wikimania