Remove more links legacy code from View