Cleared unused feature controls and organized imports