general housekeeping, removing references to ops