remove Falaise stuff
fix writing convention