Removed obsolete code.
Cleaned up existing code.