Various cleanup for DROID 6