Buildconfig cleanup