Remove malfunctioning and unused factory