removing that large block of code allowed us to deprecate a bunch of unused methods