Remove unnecessary unused variable stubs