Merge "Commented out dead/unreachable code (maybe some error in control logic?)"