Cleanup of transactions, some models, and addition of equipment definitions