Cleaned up the Home- and QueueController