Removed more stuff related to gmx.ff and gmx2.ff