Cleaned up build script
Interim commit for new connection type