fixed and tested FML cleanup issue