removal and some clean up ... inbetween