cleaning up initial discovery process