@NonNull (+1 squashed commits)

Squashed commits:

[ff3802d] fix warning
remove useless code