removed debug codes