Remove debug lines / fix protocol