Fileclient cleanup

I had a minion spinning forever (second commit). While looking into that I cleaned up the channel references.