removed deprecated ivy options and cleanup