I would "think" the GFCI is required (rehab or not), clearance would be required for NEW, but not for rehab.

The AHJ would be the one that "knows" the right answer [Linked Image]

~~ CELTIC ~~
...-= NJ =-...