[Bug #8578] Unnecessary code removed