Removed unused queue stuff