clean up of crap up and new module