starting some clean up