Disable fixing of integer variables in local search
Clean up dead code
Refactoring for issue #113