Cleaned up file.

Removed some functions that were labeled to be removed long ago.