remove unreachable breaks
remove unused assignments
remove double method call
remove unused callback parameters
remove unused assignment
Revert "remove double method call"

This reverts commit a25b123940b3ddd2f153a4452617278829e72d42.
add return, for clearance
remove unneeded method call
Merge branch 'cs/#6969-dead-code-removal' into develop

Close #6969