Undo merge mistakes
Remove a few remaining prints