Unused table removal

Cleanup for #451