Remove unused variables - cleanup