cleaned up a bit
fixed a bug in queue remove fc

I forgot some check so that it didn't remove all items that it should