Removed commented code on line 407