Fixes invalid interger referencing also removes un used group/queue creation