Cleaned up mortality system.