Overall cleanup part 3