major JSP cleaning

Change-Id: Iaf0cce5bfb8fea2473aec348fce49f09da34d190