Cleaning up buildsys