Revert "New features"

This reverts commit 551fc291ea25b638fc857462a7fd18252114f84c.