Cleanup, preparing for test cases