Killed seemingly useless code