enable sys out check + remove unused code