Further file clean-up

off to a roaring, error filled, start woot