Queue fix Remove useless use Fix docblocks