cleaned some JSF