Clean up, to use common file on :TheSLinux