add deletion of KeyToTablename as well