Remove more useless code according to Swarup