[Branch ~dhis2-devs-core/dhis2/trunk] Rev 181: Removed unnecessary code. Improved code style.