emoved additional code added by merge