Cleanup of earlier commit