Add default 'defaults' file and remove deprecated variables