small fixes
cleanup redundant interface declarations
fiddle with RuntimeInfo and @NonNull