removed commented out old code