Fix errors
Remove unneeded files