commented out old unneeded code