Remove unused require's
switch to bp.rkt
Add more flow state utilities