[trunk] MakeFile publishing corrections. Order seems wrong though
[trunk] Removing unused variables