Removed Junk in UI