Remove old code from this branch