Removed some unecessary control that worked it way into the project