Merge pull request #7 from Edzelopez/ISOC-20

CIVI-23 --removed cruft
CIVI-23 Finished saving accounting logic