Revert "Feature update"

This reverts commit 00efdf26f0bd7f1f47c362fc72d815794ea7314a.