unnecessary debug msgs removed