Begin to remove JpaContainer...