Some houselceaning from my hard drive rebuild