Simple dead code removal and fix for analysis structure always being free()