Cleanup; now set by Builyard