clean up & orders fix

removed old backup files and fix some orders bugs