removed type macros from queue