core cleanup: start to separate buddy menu code