Remove inadvertently non-deleted duplicate code