cleanup, prepare for ClearText
Return null when expected with finding input connections/served views.
Merge branch 'cleanup_text'