ATTENTION - Cleanup function missing!!!

Its both an issue, and a heads-up (in the other section) :slight_smile: