Quick operation. However, lacked cleanup on the ta...

Quick operation. However, lacked cleanup on the tables.