System.out cleaning

Change-Id: I709fbd7677106e84bfe8bd3aca2b223cff9abe6b