Merge "Timetest: Clean up"