Get rid of unused module
bug fix