Remove some debug, convert sysouts to error logging [1540]