Unused constants cleanup
Use fixed size addresses. API change.