Remove unused variables
Small refactor