moar work on cleanup