Removed queue stuff