removed some commented out old code