Get rid of old location info
Add support for bars and tones input