removed key handling