remove old stuff
Fix conflict