Clean-up and Mac OS related fixes.

1) Remove the things I don't understand purpose of
or doesn't see necessity of.
2) Fix Mac related stuff (command flags)