Stage 1 cleanup