Remove Infrastructure namespace