Cleaning up theme unit data