Table now cleans up properly