Builder: Cleanup