WIP on flow client.. removing unused stuff, simplifying, cleanup.