get rid of a few assignments