Ripping out useless code