Remove AOP Hacks for #11

Remove Obsolete AOP Hacks in Obs/Encounter/Patient ServiceAdvice files.