Removed Unnecessary UI elements & calls