Removed useless controls