Remove depr features
Commit into code features from production