Code cleanup and JSF performance changes