Style fixes, remove debug printfs
Remove useless code.