New newsletter framework - Cleaning up