Remove dead files.
More robust parser. Use parser for of_string funcs.