Clean up.
Removed unused methods.