Removed some of the stuff left over from previous application for school
(mostly comments)