A little more cleanup, going to stop for now