Dead code warnings removed, fixed underlying issue.