Project 3 Completion

Also cleaned up some unused files