Forgot this class - get rid of new ClassName instantiation
ref #16