Removed bits of conflicted code.