Another module display bug fix, added in 'clean' command,
cleaned up unnessary module imports.