Remove unused module imports, use clcommon content helper method.