Remove logic from security.userid
Remove logic from security.userid

The logic should have been contained within the authorization policy,
that is where it now lives. This function is now much simpler and
cleaner.

usingnamespace/usingnamespace