Removing unneeded classes for json serialization (moving to depict)