Got rid of uneeded modules