remove now-unnecessary params
misc tweaks