BTA5.agda
Further cleanup