Removed unwanted features