Added additional support for Ubuntu clients, fixed cleanup process