Fixed build scripts.
Cleanup