remove historical unnecessary code