Reverted changes of generic-cleanup in Views and the dependend classes.

undo of several changes which came with 1ca76065b4cea92924d27490a7cf505834b16140