Commented out unneeded code