Replaced/removed unnecessary code
blablabla