Refactoring to exclude UserPrinciple, unnecessary type within current context