Removed unused features.