More OWL-related cleanup