Remove currently unused variables