CleanUp in Keyboard
fixes