removed commented out garbage