Clean up for code merge to stage.