Clean up. Work in progress of persistence to Dynamo.