Remove feature (7/18)

Remove feature