Remove feature. Fix dupe bug