Configuration files tidied up