Remove no longer required settings