Revert "new features"

This reverts commit 4de828b4ac00479b77f065f8874d3b47729e38ff.