- Convert to using supervisord instead of systemd due to issues running on Ubuntu hosts
- Some other minor cleanups and optimizations