unnecessary code was removed