Cleaned up file.

Removed unnecessary code that was commented out a few years ago.
Cleaned up file.

Removed unnecessary code that was commented out years ago.
Cleaned up file.

Removed unnecessary code.
Cleaned up file.

Removed code that has been commented out for years.
Cleaned up file.

Removed some functions that were labeled to be removed long ago.
Merge pull request #457 from Cipherwraith/ron

Cleaned up some code.