Remove unused variable and two function stubs