Cleanup, stage 1.5