Miscellaneous cleanup before implementing rest of song/character match logic