Clearing out useless code