Moved some debug code to infrastructure

Moved draw framerate logic to infrastructure and set to draw on debug
only