fixes codepro issues and remove system out statements