Remove commented out unneeded code

Remove commented out unneeded code