Finish remove debugging code