Bugfix
Dead code fix