remove ~100 loc