DeleteKeys some more change

Some more change for delete keys