WCP-55 - More jsp cleanup.