Remove unused variables
Update libraries