Cleaned up feature dependencies