buildsystem clean-up