Removed extraneous code that was introduced while resolving conflicts