Actually remove Keyboard references