cleanout some old code, tweaks