Cleanup to get the minimal possible functionality for first test.