Remove unused code, fix printing