remove undesired features and fix