Remove logging, some minor tweaks