Remove debugging code, update some texts