Delete useless files
Some changes in attempt to fix bugs