Revert "New Features"

This reverts commit de7e5bfa3d9d1a743d2d09c91cf30e7a990c902a.