Tidy up references to removed modules

Tidy up references to removed modules