Cleaned up code
-Removed unused classes (associated with LastFM)