Fix droid doall and droid release, remove redundant code