fix fails
and remove old stuff