Moving the efficiency calculations before the cleanup (Guiseppe)