MINOR CLEANUP of FMU