cleanup part 6