Final

Uncommented comments and deleting 4 lines of method calls.