Remove hardcoded queue