Remove empty mask references and perform a small tidy up of some code.
Remove all conversion functionality from the grImport2 package.

It now belongs in the 'grConvert' package.