Code clean up.

Removed unneeded methods.