Start removing unused parsing logic