Merge "Fixes for eclipse warnings unused variables"