Add additional cleanup for table stubs