Massive cleanup - including register overhaul