WIP: Remove static variable declarations.

- Done to prevent mixing behavior.