removal of unneeded defines and erroneous couts