cleanup part 9