Removing additional dead code.