Remove leftover class from first implementation