Removed debug code
Merge