Clarify logging
Remove test code