Clean up router file, add ability to clear queues