Remove more crap, make stubs
Scaling code