clean up some legacy util stuff
debug shell cleanup