removing unused methods, refactorin

... ie moving CCL so only created if required, when determining whether
to unload existing metadata for class.