removed some outdated changes