Simplify freebuff model selector by removing redundant intermediate arrays