More debugging code removed