Remove debugging stuff before merge