Clean up code that is not needed any more, add test data needed for our test classes