removed debugging code and commented out original code