cleanup part 5