Merge "Removed sysout and replaced with logger"