Yeah, these are the suggestions I like. No one should "axe" anything unless necessary, and the best option is to a) keep the existing feature as a part of your idea, and b) make it as easy to implement as possible.