Merged with master
uninstalling cocoapods is hard
Some refactoring