[IMP]Improved some code and removed unused py file.