Misc cleanups.
Continuing along. Checkpoint before getting PrincipalSecurityTest working again.
Need to solve asm conflict.
Green