removed Dead code
Merge branch 'Develop' into Christian