UAR-865 removing code that is not needed and fixing jsp formatting.