Use new, cleaner build system