Removed some unnecessary code
Merge branch 'master' of https://github.com/g0zar/ARDS