Remove commented code
Updated to latest rust
Use keyboard module for all key event handling