Remove the horrible active_policy_id because we're not using it anymore
Remove unused helper