Remove Commented out the unneeded code