Cleaning up
Remove logging