cleanup EPP guard handling with R17