Remove a few logger lines and some old, unused code