Cleaned up creation of drop flows.
Removed controller flow helper.