Remove old Factory calls.