Removed commented out old code