lots of cuts and cleanup