Removed too much logging