Remove feature (5/18)

Remove feature