More removal of unnecessary code.