Remove unused imports.
Fixed markers getting deleted too early.