Revert "Feature function augmented"

This reverts commit 6cc3bc22103bdffced0a2e6807becca49dd7225c.