Clean up AuthenticateAttribute, refactor user profile data