removing old code pre-xml