removed commented out block