Remove AOP Hacks for #11

Remove Obsolete AOP Hacks in Obs/Encounter/Patient ServiceAdvice files.
Merge pull request #17 from jembi/remove-aop-hacks

Remove AOP Hacks for #11