cleaned up the various different policies