Remove options which are no longer available and add config support