redundant debug functions removed