Remove AgencyOfficeResource; PEP8 clean up