Removed debug modifications