First version cleanup.