get rid of some unnecessary stuff