Flt sample support

Not really "cleanup" I guess, but I forgot to switch to a new branch.