more clean up, actually track helper files