Add missing dependency, remove unused code
Use simpler build setup with new configuration logic