Removed debug calls