Removed references and fixed some mal-merged lines.