Refactor.
- Remove unnecessary future-proofing