fixed unnessecary code because of merge