cleanup build a bit