Removing some unused code and marked code.
Adding flowManagerMockTests.