Cleaned up mailers for test/dev