Fixed crash on changed delegate signature & simplified
Make removal of X.org hotkeys definite and permanent

Need to reimplement hotkeys in some other way in the future.