clean up some redundancies