More cleanup.
Removing unnecessary code.