removed some log calls