Remove long stack queue, use single object