Removed debug code
Removed debug code
Code cleanup