Remove feature (8/18)

Remove feature