Remove some leftover debug stuff
Refactor platform representation