Unbreak previous commit
Remove references to deleted feature