Removed debug feature