CE-1103 Remove debugging bits