Fix bug for fyis controller. Remove legacy comments.