Cleaned initial version

Removed debug code