Remove logging
Remove commented out code