Removing annotation stubs