Feature parity with app, cleanup