Commenting out some more parts to speed up testing.