Removed unused code and loggers