[kb] Remove DEBUG key-F2 debug stuff and some minor cosmetic refactoring
[kb] Remove DEBUG key-F2 debug stuff and some minor cosmetic refactoring

vvaltchev/experimentOs,vvaltchev/experimentOs,vvaltchev/experimentOs,vvaltchev/experimentOs