Revert "New features"

This reverts commit a0b4979b2fe55dc9d958f673f90ce2e97bcad5e2.