Overall cleanup part 1