Revert "Extra features"

This reverts commit 687cc4db72d03da3d39575bad7499d1ab0f79e66.