Missed removing some redundent code.