Delete useless file and code
FIx some bugs