Removed debug logging
TODO comments