Revert "new features"

This reverts commit 6869ea62a47dbdaad3b6d8d87bd4d7ce7d083812.