more fixes. remove some stuff.