Get rid of obselete module
Hot fix