Remove droid version in this branch