Removed unnecessary controls