Removal of utility class