Remove unneeded compartmentalization list imports.
Remove few warnings.