Removed debug logic