Clean up of feature list