random: some cleanup.