slowly making refinements, and what the hell is up with my previous commit msg -- damn you github
removed some dead code