All of the Extra X feats should be replaced with a single Extra Class Feature feat, with specifics in the class feature descriptions.
.
.
.
.
Choose one class feature. You gain extra uses of that class feature
Prequisite: Class feature that allows Extra Class Feature to be taken
Benefit: You gain additional uses of one of your class feature. See the class feature description for details.
Special: You can gain this feat multiple times. You can only apply this feat to the same class feature more than once if the class feature allows it, otherwise it applies to a different class feature.
Lay on hands, for example, would have the following additional text:
You may take the Extra Class Feature feat for this ability. Each time the feat is taken, you gain two additional uses of Lay On Hands per day. You may take the feat multiple times, and the effects stack.