Major overhaul – remove (nearly) all ridiculous complexity