Removed some stuff that resulted from the merge error.