Removed excessive comments and functions we weren't using.