Cleanup of unused methods.
Removed more unused methods.