Removed some unnecessary commenting/code.