Add logs
Remove debug statements