Code cleanup: remove dead code

Continue code cleanup work during investigation. Dead code is removed, it is confusing.