Cleanup in genOCL