added inactive status to payments, cleanup