Update to CPLEX 12.6 and minor code cleanup

* Update to CPLEX 12.6