Eliminated extra commented out stuff.