Algorithmik cleanup.