removed unused variables
fixed method signatures
Merge pull request #5813 from craue/code-cleanup

code cleanup