Resolve technical debt/legacy related to the build-system