Eng 6380

Dead code, you can delete the commented out stuff.