Cleaned up UI and unused code.