Ubuntu headnode cleanups