Removing un-needed queues.
Adding support for displaying the source locally.