Clean up a bit - should be a no-op