Drop NFC-removal leftovers and tighten a few obvious patterns#41

dadachi merged 1 commit intosubstrate-v2nativeapptemplate/NativeAppTemplate-Free-Android:substrate-v2from

substrate-v2--refactornativeapptemplate/NativeAppTemplate-Free-Android:substrate-v2--refactorCopy head branch name to clipboard