More const-correctness
Remove unused function declaration and definintion
More logging clean-ups