Post refactoring clean up and testing.