updated unnecessary code
merged