I think I also got rid of this class as unneeded?