removed some debug commented line