Code clean up to get loading of JSP pages working correctly