Clean up feature items more