clean up, license tbd