Get rid of just new ClassName instantiation