Remove useless code - part 2