Cleanup unnecessary files and code