Various

* Alt key mod now work again
* Use TrimSpace
* Remove some unused code (need to delete a LOT more)