Testgenprotectremoval

Removed the generic protected package in favor of using protected types directly.