removed redundancy/deprecated code