Remove silly struct that's silly
Break everything to make an AST