more cleanup - just needs Linux Mint port