Removed some lines that got in from the merge