Remove unused features