Removed debug in functions