removed some debug codes