The class was not needed and had bugs, simplifying the code.