Remove feature (4/18)

Remove feature