removed not used code
Merge branch 'i23-remove-dead-code' into develop