#362 Remove redundant variables