Removed Kiwi (it's not being used) and fixed .gitmodules file