Clean up the advantage code