cleanup part 2