[compat] general cleanup
[compat] general cleanup

Closes: #4700
Approved by: sausagee

aptos-labs/aptos-core,libra/libra,libra/libra,libra/libra,aptos-labs/aptos-core,libra/libra,aptos-labs/aptos-core,aptos-labs/aptos-core,aptos-labs/aptos-core,libra/libra,aptos-labs/aptos-core,aptos-labs/aptos-core