cleanup is now a debug not a warning.
Merge branch 'test' into dev