Removed bad class and avoid private factory bug