Removed unused features