Remove unused variable
Remove function that shouldn't have come over yet