Cleanup debug code before PR