Cleaning up code & removing redundant functions

Removed comments that appear to have been for debugging purposes and
those noting the additions by lpercifield, since the additions/changes
can be tracked on GitHub