Remove duplicate factory