Staging instance, all changes can be removed at any time
Unused methods were removed and type annotations fixed.
Migrated from D5862 (view on Phabricator)