Cleanup CAST_PLR from custom patches