Clean up unused variables reported by user.