Remove redundent stubs