1 more code cleanup for FOTE