removed extranious logs and commented out code