Remove old parsing functions, disable fmel
Minor changes