Remove JFactory dependencies