Deleted unnecessary lines
Merged