get rid of old stuff
fixed merge