Remove stupid stubs