Code cleanup

Removed superfluous code, comments, and lines of code that were not
being used.