Cleanup up calls to create paths