Removed unnecessary controls from Grid