Remove deprecated controls