Remove more unused roles
Add option for extra variables
Fix mailer checks