Add CMD cursor into the cleanup