Build definitions cleanup