Clean up some require statements
Add OpsGenie support