code cleanup: fixed warnings, removed unused parameters, etc.
Authored by: mrieser 2010-02-10
Parent: [r10355]
Child: [r10357]