View2: better cleaning of references
View2: removed old variables
View2: only add the necessary props