Clean up cybox.core as well