Fixedsmtp mail service + Other cleanups