Removed debug codes