Going to solve the conflicts with changes on removed ViewHelpers when we are done and when i am going to ammed these changes to the commits before.