Got rid of those crappy modules