part 1.1 of error cleanup