Removed the random snippets that were added during merge.