Remove old code from master.