More face ordering fixes. Remove unused code. Fix byte compile warnings. Tidy key bindings