Fix issues
Remove unneeded files