part 1 of cleanup... not ready yet