Add filesize to the name.
Cleanup tables