rm unused variables
merged in changes from master.