Bit off a tidy up and remove some empty files