clean up for unix port
58 files changed