cleanup was too optimistic