Fix OS specific path issues
And remove some unwanted imports