Back to air-gap process