Taking out some unnecessary code.