Remove more JFactory dependencies