use commonplace and cleanup

Removed most of the non-functional stuff. Lets add it as we need it.