Remoed some unnecessary code.