clean out straglers
moved some things to js