Fix overall issues and remove backup files