more cleaning up in this repo