For me the best way to sort the shit out on your hard drive is just to back up, wipe and go for a clean system install. There's nothing like a fresh OS happily beavering away.