You can remove this commented code I think :)