Remove redundant code
Remove redundant code

hackaugusto/raiden,charles-cooper/raiden,charles-cooper/raiden,tomashaber/raiden,hackaugusto/raiden,tomashaber/raiden,tomashaber/raiden,tomashaber/raiden,tomashaber/raiden