Overall cleanup part 2