Removed old obsolete methods, cleanup the UI