Clean up
clearAllDir now clears role dir
update .flo for new semantics