Shrinking some useless code