added version tracking for structure maps + cleanup