build definition clean up