[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7951: Removed a bunch of unused code and did some other code cleanup as well.