clean up stubs (many aren't needed anymore)