Removing the "leaky abstraction"

Instead focusing on target policies instead of generalized