Removed usage of of the logger for now. Will be replaced.