Remove frame counter and remove uneeded comments