Tidy up poms for Queue