Remove unused files
Change some function names
Update to use default key format from spotify