Remove AddressPrincipal
Trivial refactoring - use constants instead of hardcoded values