move common cleanup steps to common (augmnetSimplifiedCode, augmentSimplifiedCode)