Comments update, unused imports removed for commons-module