Cleanup & move more submodules to Cocoapods