removed author from file headers, added @since
injecting logger
cleaned up the mess. Removed unused and unnescessary files/lines