Revert "Add features back"

This reverts commit ddfca0b8a66e261661d586f178761bfff2aa2c7c.