f-list cleanup

[oconel]

I'm tiding up my f-list and I hope I haven't deleted anyone by mistake, if I have, let me know.