Code cleanup for sandbox so I can work on the MPD buttons easily.