I am +1 to remove it for simplifying the class