cleanup part 7