cleanup.. finding issues with larger mapping collection and memory corruption