Remove unnecessary code, that was originally 
added when working on Part 2.