Use CommandQueue instead of locks to deal with removal of ActiveStreams