Remove feature (6/18)

Remove feature