Removed a few lines inadvertently added during the merge