Changed the order of the methods and deleted some unnecessary out commented code.
Authored by: wellgis 2013-05-08
Parent: [r285]
Child: [r287]