remove out-dated and reformat