Cleaned up some drop table code