Removed logging component in favor of just using OutputInterface
General refactoring and code cleanup