Cleaned out a large amount of old code, formatted many files, removed test code for MP1, etc;