Commented out useless code