additional cleanup
cleanup continues; fix dependency argument loading