Revert "Add helpers for artist naming"

This reverts commit fab8f850511adb75fa751dd2202ec4da0f9051ca.