Less logic needed for dropping tables