Corrected some more build script related changes
Remoed unused imports