cleaning up unwanted namespacing and files