Revert 4775e26..6971509

This rolls back to commit 4775e260bcbd5048c696dcebef54f28e654acbe6.
fixing rollback and cleaning up println stuff