Cleanup builder enforcement