removed various puts calls