Remove inactive and queue, it wasn't used anyway