some clean up!