deleted unnecessary codes
Merge branch 'work'