I'm not sure anymore what purpose this block of code served. Let's remove it and if somethings bugs, we'll add it back with the corresponding code.