[Branch ~dhis2-devs/dhis2/dhis2-chis] Rev 409: cleanup