fix Queue name conflicts
clean up code for MyQueue