Remove unused null'
Remove unused wireIsOneOf
Warn about deprecation, reorder code, remove redundant imports