Got rid of some unnecessary code.