DHIS2: Removed commented-out code