Removed logger, some minor changes.