cleanup stage 1
merge and cleanup stage 1