Cleanups. Less noisy. Works for ubuntu and server