How can I migrate your library from gms to androdi libraries maps?

[stenol53]

Hello.
In my app when I click a cluster it opens dialog fragment with list of items. Then when I click item it opens another fragment. And when I pop back to map fragment my map very lagging. Then if I open dialog again and dismiss it map works as usual.
Found same problem here but there is no any solutions that help me.
It seems that the problem with gms maps, so I tried to modify your library in my app using 'com.google.android.libraries.maps:maps:3.1.0-beta' instead gms and it solved problem with dialog but there is another problem that some markers don't remove when clustering.
Can you help me migrate your library using android libraries maps instead gms?