commented out old unnecessary code