removed unused variables / assigns never used
Merge pull request #1257 from schmurfy/cleanup

removed unused variables / assigns never used