UAR-865 Fixing unneeded code and jsp formatting. See comments in jira.
UAR-865 removing code that is not needed.