Cleanup before first commit