Removed more cruft and modified files so they would work