cleanup part 8