Cleanup

Cleanup suggested in https://github.com/dimagi/Vellum/pull/235 + fix for build script.