getting rid of one more class