Cleanup part 3.