clean up some redundant stuff