Table 2 cleanup and fix

Removed trailing old code, code should now run in one call.