Revert "New Features"

This reverts commit 1c928a96d8c878e13dcee061d49f2b4b9d76ae63.