Revert "MP1-2467 : Minor cleanup" (This should be done in another rework) but we need to keep change from GUIKeyboard.cs

This reverts commit e9d47cf117e8a3912d20c2d2a54722fc299152fd.