more clean up, going to merge into main branch