Add some DROP TABLEs and comments