Prepared for submission

Deleted all of duplicated code and comments indicating who wrote what
parts of code.