Additional cleaning of gromacs_topology parser