Remove unused feature from main