removed duplicated code
removed unused method
Merge branch 'master' of https://github.com/MusesProject/MusesClient.git