BUG: -1 in cleanup unnecessary