Cleanup

Getting rid of duplicates and unnecessary files