Rework product features, elimiate some scenarios and simplify