Adjustments
Removed debug code