Clean up feature and dependencies