Cleaned up naming and removed unneeded methods.
Cleaned up more unneeded code.