Removed unused code
Removed debug log statements