Code cleanup, removed some log statement