commented out unneeded things