cleanup: remove unused static fields