Issue #2371855 Removed old views legacy code.
Issue #2371855 Removed old views legacy code.
Updated the js and taking little cleanup with it.