did testing and did some clean up