cleanup part 4