Policy Refactoring

Added refactoring to clean up some Policy code.. This is Part 2 of the "Destroy" project.

-Jen