Removed some logging .. will make this conditional later