[issue-335] Remove unused vars