Cleaning up old stubs