prepare for flotilla rewrite
simplify main after refactoring to use flotilla