wip
remove debugging
misc cleanup