Merge "Remove unused variables" into tizen_2.2