Cleanup

Removed obsolete methods. Cleaned up using statements and formatting.