Finallly removed all testing stuffs