Fixed issue where previous blockId mappings to trains weren't removed