- do a bunch of cleanup of unnecessary code