Removed key checking