Update to remove common config