Remove queue dependencies not used for testing
Change default settings