major cleanup part 1 complete