windows compatibility fixes
reverted unnecessary changes to cleanUp() functions
Merge branch 'windows_paths'