Fix cleanup/setup usage