further cleanup.  maybe done screwing around now?