Removing more unnecessary code.