Tidy up and remove unused configuration key