Clean up BlueprintManager code