More cleanup, add defective Amount to production